This should fix the bug out there right now