Hopefully fixed #24