Bug finally fixed