Fix #561

Sorry for the previous commits.