Minor Bugfix (Final Build 1.1.1)