fix #227
even better