added rotation fix