Fix Issue 270