try to make it working fine