Attempt to fix empty menu bug