#252 fixes this in 2.x. Need to move fix into the latest master line, as well.
#252 fixes this in 2.x. Need to move fix into the latest master line, as well.