Hopefully fixed issue 10