FIX: Use defaultsTo() instead of || for volume