Fixed an issue with son 1.8.1