Fixed issue #287