OK, fixed bug for real