DEL-23: quick fix