fix in order to enable custom routing