fixes #533, for real this time