Suggestion on how to fix #205