Properly fixed now