Bug Fix Menu Handler