Quick fix for Issue #1817

A quick fix till the proper fix is applied