This seems to fix the lock-up issue with 0903
This will create a new commit in order to revert the existing changes.
