Fixed Bug 1

See Incident # 1
Bug 1 fixed