Bugfix + tap here message