Fix for GF-45640