A_Bugfix-0001

Hoping to fix Nell's issue