FIX: Some problems for adding transactions