simplify, which actually fixes a bug