Added changes from wet-boew/wet-boew#1173