Fixed the bug hopefully?