isElementButton hack and first step skip bug fix