Added workaround for bug in ApplicationBuilder