Fixing minor Bug