Bug Fix (Already fixed in dev branch)