removed hack condition