Issue 292 fixed