Finish/polish workaround for store

Make sure that check for ps is working.