Temporary fix for 1775.
This is TEMP. Need to work out a real solution.