Fix on build