Yet another bug fixing