button grab hot fix
need testing