removed excessive casting