bug fixes 7 (final)