Issue 1: fixed. Add more testing.