Fix bug in staging