Bugfix Tophat mapper and index check