/quick fix 6.2