Bugfix for client side