Removed the cast in both cases...