More fixes related with previous commit, #205.