fast fix, clean up