Fix issue tap disable