fixing [#2169881] and [#2175509]
Updating [#2169881]