MOB-1177

**DO NOT MERGE YET**
Good catch! :+1: I missed it here :sweat_smile: