Beamanuel Tesfaye

This is a bug I've had for more than two years. I initially thought it was a shim issue that should have been fixed by a version bump and reported...