Revert last change because it causes a bug