FIx for issue #59