Bug Fix Complex

tbd