[EXT-144] lets not break everything ;)