Issue 271 fixed