Fix for gcc