Fix #103 on client side. Still have a bit of cleanup to do.