fixed issue #269, added core test to cover it and then discovered that OpenSpace had the same issue, so fixed it there too.