Fixes #412 and a possible niche issue