Fixed the Top Level bug