Fixes #19: Dropping client side string check