[Issue] Working on #8. Better solution found.