Important Bug Fix