reorganize previous fix