Fix for ISO C90 compliance