Menu fix #1