Fix according to @mglukhovsky