Update: 3 in 1. fixes