Bug fix for session #4