worked on https://github.com/nuams/apps_catalog/issues/9