Fix #723

This fixes #723 (I think ;-)