Fixed issue #249