Fixing a known by me bug, I mentioned it at https://github.com/ivantcholakov/starter-public-edition-4/issues/16