Fix #22
Thanks to @Anthiste