ISSUE #8. Maybe fix, have to testing...