adding fix for issue #285