Fixed problem with revised code (ABM-448)