[TESTING] Better fix for #46