(hopeful) fix for disabled-ness