Hopefully fixed rotation issue