Minor Bug fix
Changes for AF