Fixes Bagnon issue #159