Fix part of #278

pls refer to https://github.com/open-classifieds/open-eshop/pull/278#discussion-diff-16971962