Issue 364

Fixes 364