Fixes, fixes and fixes [again] [part 2] [FIXED] (... that's a repost, lol)