fixing #1 for good