Previous fix was not working properly.