Fixed bug with new version, another small fix