Finally fixes issue #64