fixed extractThis logic