Issue 678 [Needs Fix]