Fixing #379