Hopefully fixed #28