fixing the previous fix, now working fine