FIX: Minor adjustment