Omnibot fix