Bug fixing

... and is a possible source of mistakes