Temporary fix for R15