Quick fix 2 (not tested)