Partial fix

2 Topics