Fixed incomplete implementation.