Issue 455 fixed