Tried to fix #86, but it already is.