and-bug in the end fixed