Quick fix to move a potential bug