Quick fix 0.2