Fixes #195 (thx!)