Fix Issue 264