Fixes Client model