Previous fix was not working