Finally fcking fixed