quick fix and remove debugging statements