Make compatible w/ base-4.8