Fixes Issue/382

Fixes #382.