Fix for #244

:)