Whoops. This actually does fix #221