Fixed THE bug