Fixing left/right issue