Fix a bug in standalone introduced by the previous commit