Fixes https://github.com/bootcards/demoapp/issues/15