More Bug Fix