#GSC-3 fixed