Issue 376

Solution for issue #376