fixing beforeCasting - Remodeling design