Temporary fix from last commit