Custom rotation bug fixed