revert half fixed bug (426)