Hopefully fixed #7