Fix Issue 280