Commenting and casting fix