Some shit from non-existing branch merge fixed (or whatever happened)