Fix 482

Remeber to apply this on top of the previous commit in this branch