Fix: Previous fix was not complete