Hopefully actually fixed #3.