Use less hacky solution for rotating directions