actually fixed #1