well that was stupid! Fixes #558