Fixing issue #3 of the main project.