Master - fixed touch listener