Re-appplyng fix to issue #50.