Ref #21 - Improved fix for strict errors in 5.4