Fix Issue 255 and 258