Temporary fix (regression)