This should help resolve #1918 and #1074.
This should help resolve #1918 and #1074.