Fixes GH-51.