change method name [@sunny-mittal credit] and safe cast