FIX: Division by zero crash in some cases (Philip)