FIX: Small issue with overflow