Added fix for selected side being empty