Bug Fix again