Code removed for now. It introduced another bug.