Fixes Topic 4