Fixes Issue 30 - locked clients