Fix for obus-3657