Fix rotation of geometry by Rong-Shyang