properly fixes #528