fix strange stuff #130