MAke 5.3 compatible