Bug fix rotate