fix issue S-54