fix returns so there is only one path

better debug code