Quick fix of