Fixed [Issue 3]