Fixed 1. Bug