Fix refactoring

Seems surface should be container - or the other way around - it throws error `add of
undefined`