Issue 1305
