Related to 779ed5a88d45ebd9352b558a6c669a8a82e544e3 ; app could not work until this commit