Properly fixes #535