Fixed latest commit [Issue #80]