Make compatible with Version 1.5