Issue 01 fixed