Jayce's R

When switching to the ranged attack from hammer there is no problem but when you switch from ranged to hammer it creates a CONSTANT half a second spike. It is really bothersome when in a team fight and trying to burst down enemy champions. I know couple of people who stopped playing Jayce because of this. Please fix this.