bring back @tomalec changes