MOB-2585 casting removed