the simple fix possible. sorry for all this to ended up in released code