Implementing previous fix