iCreate Issue 158