#745: #730: quick fix
opened by thuchacz