Fixes #19, again