- Reverted a part of last commit to fix a bug.