Fixes classcastexception for arrow on user side
Merge pull request #320 from glee23/master

Fixes classcastexception for arrow on user side