remove the workaround cast