bug fixing

M A A F