/quick fix 6.1