this should fix the bug