Fix on deploy