Improved previous fix