Fix with cast