fixed #217 for real