20181005 citizen.stories: Can we have permanent solution for this ?