Fixing minor bug...