Additional partial fix