Bug Fix of cf15db5