fixed build for >5.4