bug fixes
enable not top to work properly