Hopefully fixed #6