cleaned up previous fix