Make compatible with SL6