[FIX] actually fix DEV-44 in all cases