Bug Fix from current edits