Bug fix on client make