Fix for duplicate definition