Fixed with #53