Restored change by Axel for strlen replacement