#12 - fixes on client side