complete disable working again, do not like the solution, though