Fixed? a bug - need to check other changes to make sure they still work...