Bug revised and erased hopefully...