Fixed issue after !282 (merged).
This is a problem caused by a confusing implementation in my work !206 (merged).
I am sorry.
