Properly fixed bug