Quick fix (not tested)