A better fix for issue #49.