Fixing custom menu support