#244 fix