Bug fix, now working.