Fixed issue #388