Temporary fix for generic join