Fixed the top options problem