I really should check before committing...