Issue #1108396 by Jalpreet: Bug Fixed