fixed right sidekick handling