Prev fix was incomplete