HJMO -477 - Fixes Vibration Damo Falls 22