Fix issue #244

#244