Fixed issue #324