A fix for https://github.com/ivantcholakov/starter-public-edition-4/issues/16