Fixed more on casting issue