Attempted to fix issue 5 on ZeroBin port by Privly