Fixed a bug on client app