fix dusk bug, ugly hack