Fixed last commit, Issue 28