Hopefully fixed #41