Properly fixes #460