partial fix III
partial fix IV