[issue #353] [WIP] fixes a bug