Temporary fix for version compatiblity issue