#Issue 1293

#Issue 1253