Revert "Jemma's bug fixing. "

This reverts commit b2efe054f7bbb2841a4ab8ef1d930e5d9fd0a1c1.
Jemma's bug fixing.