Fixes

* Bug of empty word fixed