Top fix #2