Resolved issue #379