fixes #561 again