quick fix cleanup, fixes #2