Grigory bugfix