andrew bug fixed