Better hack for sidebar issue