Lock when@3.2.3 due to a bug