Bug fixed. AH-562