re-fixes #32 (previous fix was wrong!!)