Partial fix (work in progress)