remove unnecessary cast
merge changes from github