This fix is also required for issue #56