avoid dangerous fromJust
fix policy