Client side: Added f**ked workaround