remove hack and fix real problem