grid offset fix
pull merge