Fixed #379