The original patch adapted to astersik version 11.4.0